auto merge of #487 : Insanity133/cargo/patch-2, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 30 Aug 2014 02:44:07 +0000 (02:44 +0000)
committerbors <bors@rust-lang.org>
Sat, 30 Aug 2014 02:44:07 +0000 (02:44 +0000)
commit789c94be0fb9d8801429ff3e15f85a21559cbfd9
treec6fb32fd124a31a06d7bfdcdaf24e3f9f3db06e2
parent2c8f8e75c537605ac39b2309f4363d53109cdbe7
parent37350f5fc1a1551fee32c15c5a06118e388a22b3
auto merge of #487 : Insanity133/cargo/patch-2, r=alexcrichton

This is a fixed version of PR #478 on the gh-pages branch.